Reorganize value mapping logic to facilitate inbtroduction of list views