Now using incrementally built inverted CongruenceMap