Added check for email addresses