Added datastore indexing