Add cancellationToken overloads
Incorporate code review feedback.