Adds more complex indexing