Added generic visit support