Moved to latest value-mapper to meet refactor