changes to correctly deal with the default datastore and create new data store options