--- a/src/relpipe-in-csv.cpp	Wed Sep 23 11:26:33 2020 +0200
+++ b/src/relpipe-in-csv.cpp	Wed Sep 23 16:58:48 2020 +0200
@@ -30,6 +30,8 @@
 #include <relpipe/cli/CLI.h>
 
 #include "CSVCommand.h"
+#include "CLIParser.h"
+#include "Configuration.h"
 
 using namespace std;
 using namespace relpipe::cli;
@@ -44,9 +46,11 @@
 	int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR;
 
 	try {
+		CLIParser cliParser;
+		Configuration configuration = cliParser.parse(cli.arguments());
 		CSVCommand command;
 		std::shared_ptr<RelationalWriter> writer(Factory::create(std::cout));
-		command.process(cin, cli.arguments(), writer);
+		command.process(cin, writer, configuration);
 		resultCode = CLI::EXIT_CODE_SUCCESS;
 	} catch (RelpipeWriterException e) {
 		fwprintf(stderr, L"Caught Writer exception: %ls\n", e.getMessge().c_str());