Fix version of datastore and reorder initializations