Updated file_manager and utils