--- a/src/relpipe-out-tabular.cpp	Sat Jun 06 01:50:44 2020 +0200
+++ b/src/relpipe-out-tabular.cpp	Thu Sep 24 18:57:20 2020 +0200
@@ -24,6 +24,8 @@
 #include <relpipe/reader/RelpipeReaderException.h>
 
 #include "TabularPrefetchingHandler.h"
+#include "Configuration.h"
+#include "CLIParser.h"
 
 using namespace relpipe::cli;
 using namespace relpipe::reader;
@@ -37,16 +39,10 @@
 	int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR;
 
 	try {
-		// if (cli.arguments().size() > 0) {
-
-		// const wstring commandName = cli.arguments()[0];
-		// vector<wstring> arguments(cli.arguments().size() - 1);
-		// for (int i = 1; i < cli.arguments().size(); i++) {
-		//	arguments[i - 1] = cli.arguments()[i];
-		// }
-
+		CLIParser cliParser;
+		Configuration configuration = cliParser.parse(cli.arguments());
 		std::shared_ptr<RelationalReader> reader(Factory::create(std::cin));
-		TabularPrefetchingHandler handler(std::cout);
+		TabularPrefetchingHandler handler(std::cout, configuration);
 		reader->addHandler(&handler);
 		reader->process();