Refactored KeyValue mappers