Changes made to ImportMarketData, to facilitate new class