- EntityManager refactored to use properties instead closure functions