Added features inc mailer