checked in changes for data exporter