Refactored Managers