AC-23: Added visit handling.