Added @-selectors

Another option for #1800.