Further structural changes for 'Selectors'
Selector lifted out.