[EntityManager] Some more work on creating entities.