Improvements: Mailer class added