Added NavigationVisitor