Added aliases and other updates