Manager refactoring.