Update to latest datastore interface