Add support for tag aliases