Some new Manager and Generic refactoring