Improved file management