Add line wraps and mention name check