Added VisitConverter, VisitService + fixed bugs