Add support for alternate attribute names