Now able to export to CSV as well