Fix
Refactor
ManagerManager - Revert