Added support for same-token concurrency in Task