Modified proxy and visitor.