Added async email support