Hierarchical indexing now uses tuples