+ Improvements on file reading