Market and MarketImpl now contains the correct methods