--- a/src/CLIParser.h	Sat Dec 10 20:41:40 2022 +0100
+++ b/src/CLIParser.h	Tue Dec 13 02:07:00 2022 +0100
@@ -46,23 +46,65 @@
 		else throw relpipe::cli::RelpipeCLIException(L"Unable to parse boolean value: " + value + L" (expecting true or false)", relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
 	}
 
+	Configuration::InsertMode parseInsertMode(const relpipe::reader::string_t& value) {
+		if (value == L"single") return Configuration::InsertMode::SINGLE;
+		else if (value == L"multi") return Configuration::InsertMode::MULTI;
+		else throw relpipe::cli::RelpipeCLIException(L"Unable to parse InsertMode value: " + value + L" (expecting single or multi)", relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
+	}
+
+	void updateRelationName(Configuration::RelationConfiguration& currentRelation) {
+		if (currentRelation.relation.size() == 0) currentRelation.relation = L".*";
+	}
+
+	void addRelation(Configuration& c, Configuration::RelationConfiguration& currentRelation) {
+		if (currentRelation.relation.size()) {
+			currentRelation.relationPattern = std::wregex(currentRelation.relation);
+			c.relationConfigurations.push_back(currentRelation);
+			currentRelation = Configuration::RelationConfiguration();
+		}
+	}
+
 public:
 
-	static const relpipe::reader::string_t OPTION_WRITE_HEADER;
-	static const relpipe::reader::string_t OPTION_WRITE_TYPES;
+	static const relpipe::reader::string_t OPTION_RELATION;
+	static const relpipe::reader::string_t OPTION_WRITE_DDL;
+	static const relpipe::reader::string_t OPTION_WRITE_DML;
+	static const relpipe::reader::string_t OPTION_WRITE_COLUMN_NAMES;
+	static const relpipe::reader::string_t OPTION_INSERT_MODE;
+	static const relpipe::reader::string_t OPTION_TYPE_CAST;
 
 	Configuration parse(const std::vector<relpipe::reader::string_t>& arguments) {
 		Configuration c;
+		Configuration::RelationConfiguration currentRelation;
 
 		for (int i = 0; i < arguments.size();) {
 			relpipe::reader::string_t option = readNext(arguments, i);
 
-			if (option == OPTION_WRITE_HEADER) {
-				c.writeHeader = parseBoolean(readNext(arguments, i));
-			} else if (option == OPTION_WRITE_TYPES) {
-				c.writeTypes = parseBoolean(readNext(arguments, i));
+			if (option == OPTION_RELATION) {
+				addRelation(c, currentRelation); // previous relation
+				currentRelation.relation = readNext(arguments, i);
+			} else if (option == OPTION_WRITE_DDL) {
+				updateRelationName(currentRelation);
+				currentRelation.writeDDL = parseBoolean(readNext(arguments, i));
+			} else if (option == OPTION_WRITE_DML) {
+				updateRelationName(currentRelation);
+				currentRelation.writeDML = parseBoolean(readNext(arguments, i));
+			} else if (option == OPTION_WRITE_COLUMN_NAMES) {
+				updateRelationName(currentRelation);
+				currentRelation.writeColumnNames = parseBoolean(readNext(arguments, i));
+			} else if (option == OPTION_INSERT_MODE) {
+				updateRelationName(currentRelation);
+				currentRelation.insertMode = parseInsertMode(readNext(arguments, i));
+			} else if (option == OPTION_TYPE_CAST) {
+				updateRelationName(currentRelation);
+				Configuration::TypeCastRule tcr;
+				tcr.attribute = std::wregex(readNext(arguments, i));
+				tcr.type = std::wregex(readNext(arguments, i));
+				tcr.sqlType = readNext(arguments, i);
+				currentRelation.typeCastRules.push_back(tcr);
 			} else throw relpipe::cli::RelpipeCLIException(L"Unsupported CLI option: " + option, relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
 		}
+		addRelation(c, currentRelation); // last relation
 
 		return c;
 	}
@@ -71,8 +113,12 @@
 	}
 };
 
-const relpipe::reader::string_t CLIParser::OPTION_WRITE_HEADER = L"--write-header";
-const relpipe::reader::string_t CLIParser::OPTION_WRITE_TYPES = L"--write-types";
+const relpipe::common::type::StringX CLIParser::OPTION_RELATION = L"--relation";
+const relpipe::common::type::StringX CLIParser::OPTION_WRITE_DDL = L"--write-ddl";
+const relpipe::common::type::StringX CLIParser::OPTION_WRITE_DML = L"--write-dml";
+const relpipe::common::type::StringX CLIParser::OPTION_WRITE_COLUMN_NAMES = L"--write-column-names";
+const relpipe::common::type::StringX CLIParser::OPTION_INSERT_MODE = L"--insert-mode";
+const relpipe::common::type::StringX CLIParser::OPTION_TYPE_CAST = L"--type-cast";
 
 }
 }