Refactored manager classes