Added email_address type and value option