refactoring of 'MarketData'