Make it work
Introduce mapping of old to new valueId in order to have faster compares