Refactor to StatusManager