Done changes for exporting data as CSV