Changes for new import market data mechanism