ADD: Reworked market data code