Added some aliases and exports