Added more csv fields