modified mentionMapper