Added email support to features