Adding support to send emails