Update mention feature
Update mention feature and steps