added market data handling