Updated visitor adapter