--- a/src/relpipe-tr-cut.cpp	Sat Oct 24 00:08:19 2020 +0200
+++ b/src/relpipe-tr-cut.cpp	Tue May 11 22:03:45 2021 +0200
@@ -31,11 +31,12 @@
 #include <relpipe/writer/Factory.h>
 #include <relpipe/writer/TypeId.h>
 
+#include "Configuration.h"
+#include "CLIParser.h"
 #include "CutHandler.h"
 
 using namespace relpipe::cli;
-using namespace relpipe::reader;
-using namespace relpipe::tr::grep;
+using namespace relpipe::tr::cut;
 
 int main(int argc, char**argv) {
 	setlocale(LC_ALL, "");
@@ -45,8 +46,12 @@
 	int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR;
 
 	try {
-		std::shared_ptr<RelationalReader> reader(Factory::create(std::cin));
-		CutHandler handler(std::cout, cli.arguments());
+		CLIParser cliParser;
+		Configuration configuration = cliParser.parse(cli.arguments());
+		
+		std::shared_ptr<writer::RelationalWriter> writer(relpipe::writer::Factory::create(std::cout));
+		std::shared_ptr<RelationalReader> reader(relpipe::reader::Factory::create(std::cin));
+		CutHandler handler(writer, configuration);
 		reader->addHandler(&handler);
 		reader->process();