Added indexing to stores