Updating to mailer format