Updated task for entity manager