Selector improvements