Added email delivery implementation