Add support for account tags