UnitOfWork revamped