PIM-1716 : refactor product value type