Adapt with new version of exporter