Reverted DataExporter to the previous version