The same here, can we change it to `indexedKeyValues`?