Added optional email support