Add aliases properly this time around