More additions to OrderBook