Add graph-select and node-select