Adding support for email