Update KVPair to be comparable