Updated index to new format