Add isWaiting to Task