Add monitoring and change some mailer usage