Support for labels

These changes allow the selection of arbitrary labels