Changes to file reading