Added getMarket and removeMarket