Updated to use new mailer system