Some new Manager and Generic refactoring
Merge origin/master