Moved aliases into separate file