Added some more aliases and functions