Improvements of the file