refactor for UnitOfWork instead of Population