Add arguments to visitors
Additional changes to visitor interface