Imporved EntityManager