More work on indexing