Adding indexing back to datastore