introduced MarketDataMap and some fixes