More work on file management