Add vars, remove BPipe