Added aliases and exports