Change BranchParser to NextParser, add Task type