[Bug 498564] Data-Visitor needs updating to avoid deprecation warning