Refactoring manager classes.