Refactor to managers