Changes to MarketData lib