Refactored CollectionItemIndexer