Continue big refactoring
Add manager