+ Improved reading of files.