Add support for '@' prefix