Refactored CSV parsing to more IOSP