refactored entityManager