Added basic structure for email handling