Enhance visit to support multiple paths