--- a/ArgumentsCommand.h	Sat Sep 08 23:57:15 2018 +0200
+++ b/ArgumentsCommand.h	Sun Sep 09 23:20:59 2018 +0200
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include <relpipe/writer/typedefs.h>
+#include <relpipe/writer/AttributeMetadata.h>
 
 #include "Command.h"
 
@@ -29,7 +30,7 @@
 
 		std::shared_ptr<RelationalWriter> writer(Factory::create(output));
 
-		std::vector<std::pair<string_t, TypeId >> attributes(attributeCount);
+		std::vector<AttributeMetadata> attributes(attributeCount);
 
 		for (size_t j = 0; j < attributeCount; j++) {
 			string_t attributeName = arguments[i++];

--- a/StdInCommand.h	Sat Sep 08 23:57:15 2018 +0200
+++ b/StdInCommand.h	Sun Sep 09 23:20:59 2018 +0200
@@ -9,6 +9,7 @@
 #include <locale>
 
 #include <relpipe/writer/typedefs.h>
+#include <relpipe/writer/AttributeMetadata.h>
 #include <relpipe/cli/CLI.h>
 #include <relpipe/cli/RelpipeCLIException.h>
 
@@ -76,7 +77,7 @@
 
 		std::shared_ptr<RelationalWriter> writer(Factory::create(output));
 
-		std::vector<std::pair<string_t, TypeId >> attributes(attributeCount);
+		std::vector<AttributeMetadata> attributes(attributeCount);
 
 		for (size_t j = 0; j < attributeCount; j++) {
 			string_t attributeName = readNext(input, arguments, i, true);