Add support for mentions