--- a/nbproject/configurations.xml	Sun Jul 15 00:45:21 2018 +0200
+++ b/nbproject/configurations.xml	Sat Jul 21 17:30:25 2018 +0200
@@ -5,11 +5,12 @@
                    displayName="Header Files"
                    projectFiles="true">
       <itemPath>src/BooleanDataTypeWriter.h</itemPath>
-      <itemPath>include/DataTypeWriter.h</itemPath>
-      <itemPath>include/DataTypeWriterBase.h</itemPath>
-      <itemPath>src/DataTypeWriterCatalog.h</itemPath>
+      <itemPath>src/DataTypeWriter.h</itemPath>
+      <itemPath>src/DataTypeWriterBase.h</itemPath>
       <itemPath>src/IntegerDataTypeWriter.h</itemPath>
+      <itemPath>include/RelationalWriter.h</itemPath>
       <itemPath>include/RelpipeWriterException.h</itemPath>
+      <itemPath>src/StreamRelationalWriter.h</itemPath>
       <itemPath>src/StringDataTypeWriter.h</itemPath>
       <itemPath>src/format.h</itemPath>
       <itemPath>include/typedefs.h</itemPath>
@@ -21,8 +22,7 @@
     <logicalFolder name="SourceFiles"
                    displayName="Source Files"
                    projectFiles="true">
-      <itemPath>src/DataTypeWriter.cpp</itemPath>
-      <itemPath>src/DataTypeWriterBase.cpp</itemPath>
+      <itemPath>src/RelationalWriter.cpp</itemPath>
     </logicalFolder>
     <logicalFolder name="TestFiles"
                    displayName="Test Files"
@@ -46,9 +46,7 @@
       </toolsSet>
       <compileType>
       </compileType>
-      <item path="include/DataTypeWriter.h" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="include/DataTypeWriterBase.h" ex="false" tool="3" flavor2="0">
+      <item path="include/RelationalWriter.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="include/RelpipeWriterException.h" ex="false" tool="3" flavor2="0">
       </item>
@@ -56,14 +54,16 @@
       </item>
       <item path="src/BooleanDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/DataTypeWriter.cpp" ex="false" tool="1" flavor2="0">
+      <item path="src/DataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/DataTypeWriterBase.cpp" ex="false" tool="1" flavor2="0">
-      </item>
-      <item path="src/DataTypeWriterCatalog.h" ex="false" tool="3" flavor2="0">
+      <item path="src/DataTypeWriterBase.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/IntegerDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="src/RelationalWriter.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="src/StreamRelationalWriter.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/StringDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/format.h" ex="false" tool="3" flavor2="0">
@@ -89,9 +89,7 @@
           <developmentMode>5</developmentMode>
         </asmTool>
       </compileType>
-      <item path="include/DataTypeWriter.h" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="include/DataTypeWriterBase.h" ex="false" tool="3" flavor2="0">
+      <item path="include/RelationalWriter.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="include/RelpipeWriterException.h" ex="false" tool="3" flavor2="0">
       </item>
@@ -99,14 +97,16 @@
       </item>
       <item path="src/BooleanDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/DataTypeWriter.cpp" ex="false" tool="1" flavor2="0">
+      <item path="src/DataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/DataTypeWriterBase.cpp" ex="false" tool="1" flavor2="0">
-      </item>
-      <item path="src/DataTypeWriterCatalog.h" ex="false" tool="3" flavor2="0">
+      <item path="src/DataTypeWriterBase.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/IntegerDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="src/RelationalWriter.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="src/StreamRelationalWriter.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/StringDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/format.h" ex="false" tool="3" flavor2="0">