Minor changes to store index