Added @-selectors for commands

I did not test it because I have trouble with setting up the submodules to test without breaking the commit, but I tried to make it as bug-free as possible in this pull request.