Mailer changes for datastore and dates