Improvements to file readers