Changes to file management