Fix entities namespace
Add user notification throught user manipulator