complete refaktoring ValueMappingX

consistent parameter passing