Merge "Refactor Managers to a common base class"