Added datastore functions