Added @-selectors for commands