Added functions to datastore