Changed from email service to email class.