Added more methods to visitor