Ongoing: improvements on export