refactoring: valueMap
refactoring: valuevector