Collections revamp part 1: Index reworked