Added mailer plus some enhancements