Initial email support added