Continue task definition refactor