Updates to WatchOrders and OrderMatched