Made the data export better