Collections indexing mostly working