small entity manager change