Before major changes to file manager