MarketData class changes