Added CmdNode and Pair