Moved aliases into another file and small updates