Added the ability to display email addresses