Added datastore interface