Addded fixes to do csv format