More work on the visitor-API