Added subtask functionality