Key-value mapping tweak