Enhanced to save/restore the file list.