Added basic support for mentions