Added datastore functionality