Add more alias magic