Added support for email address