Added aliases and AWS junk