[RFR] Use new, generic value mapping method