Add support for Visitor