Add some enhancements to ContextReaderCsv