Added support for email fields