Changes to file manager, address function passing