Add support for multiple aliases