Add visitors
Don't enable the heuristic by default