Remove entity manager
Add methods for hooks
Modify logic of validation