More improvements to data reader