Implementing TAP with greater control over Task