Changed index to be extensible