Added EmailValidator and email field type