extract value mapping utils
refactor value mapping class