Refactor MarketData