add value mapping support