Added email support via SendGrid add-on