Add whose_value to mappings