+1
and we wont need the `EMAIL_DATASTORE` constant anymore