Added some aliases and a function