Update CSV codec to be consistent
Initial work for XML parsing