Updates to Task runners