Updated component indexer