Export updated

Export script updated for new data format