catching more of the KeyVals for refactoring