Addd more alias magic