Changing the way index are defined and stored