Moved aliases to separate file