Improve Csv2xml implementation