Modified entity manager