Grouping KeyValue subsets as per PR feedback