Fixed export of data to include status as well