Update EmailService with latest changes.