Updated to use the new conventions in Visitor.