Mentions improvement