Improved mentions