Updating mailers and mailer logic