Improved data export