Added support for email field