Added the mailer and the timer task