Added emailContentCreator. Changed structure.