Added a bunch of new aliases