Overhaul how export data works