refactoring another few KeyVals and including Expandable