Added eMail and content generation framework