Add support for selecting and updating variables