Added some minor changes to EntityManager