Update and add aliases