diff --git a/alib2str/src/container/string/Container.cpp b/alib2str/src/container/string/Container.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a1697fea1e22586d10b6973ba0629c95af285962
--- /dev/null
+++ b/alib2str/src/container/string/Container.cpp
@@ -0,0 +1,7 @@
+#include <alib/pair>
+#include <alib/set>
+#include <alib/vector>
+
+#include "ObjectsPair.cxx"
+#include "ObjectsSet.cxx"
+#include "ObjectsVector.cxx"
diff --git a/alib2str/src/container/string/ObjectsPair.cpp b/alib2str/src/container/string/ObjectsPair.cpp
deleted file mode 100644
index 7aa2dcac0f2f6d0d65510c535e5f9c3c71226690..0000000000000000000000000000000000000000
--- a/alib2str/src/container/string/ObjectsPair.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * ObjectsPair.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "ObjectsPair.h"
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < ext::pair < object::Object, object::Object > > ( );
-auto stringReader = registration::StringReaderRegister < object::Object, ext::pair < object::Object, object::Object > > ( );
-
-auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
-auto stringReaderGroup = registration::StringReaderRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/container/string/ObjectsPair.cxx b/alib2str/src/container/string/ObjectsPair.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..9dfeb6b54f6c2f027056ba82279abe654d546f69
--- /dev/null
+++ b/alib2str/src/container/string/ObjectsPair.cxx
@@ -0,0 +1,20 @@
+/*
+ * ObjectsPair.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsPair.h"
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteObjectsPair = registration::StringWriterRegister < ext::pair < object::Object, object::Object > > ( );
+auto stringReaderObjectsPair = registration::StringReaderRegister < object::Object, ext::pair < object::Object, object::Object > > ( );
+
+auto stringWriteGroupObjectsPair = registration::StringWriterRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
+auto stringReaderGroupObjectsPair = registration::StringReaderRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2str/src/container/string/ObjectsSet.cpp b/alib2str/src/container/string/ObjectsSet.cpp
deleted file mode 100644
index 921db1e57bafa2841b62ef504cb140630bd33621..0000000000000000000000000000000000000000
--- a/alib2str/src/container/string/ObjectsSet.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * ObjectsSet.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "ObjectsSet.h"
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < ext::set < object::Object > > ( );
-auto stringReaded = registration::StringReaderRegister < object::Object, ext::set < object::Object > > ( );
-
-auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, ext::set < object::Object > > ( );
-auto stringReadedGroup = registration::StringReaderRegisterTypeInGroup < object::Object, ext::set < object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/container/string/ObjectsSet.cxx b/alib2str/src/container/string/ObjectsSet.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..587782619245a7b8fc7db3148dbd974828d3f194
--- /dev/null
+++ b/alib2str/src/container/string/ObjectsSet.cxx
@@ -0,0 +1,20 @@
+/*
+ * ObjectsSet.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsSet.h"
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteObjectsSet = registration::StringWriterRegister < ext::set < object::Object > > ( );
+auto stringReadedObjectsSet = registration::StringReaderRegister < object::Object, ext::set < object::Object > > ( );
+
+auto stringWriteGroupObjectsSet = registration::StringWriterRegisterTypeInGroup < object::Object, ext::set < object::Object > > ( );
+auto stringReadedGroupObjectsSet = registration::StringReaderRegisterTypeInGroup < object::Object, ext::set < object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2str/src/container/string/ObjectsVector.cpp b/alib2str/src/container/string/ObjectsVector.cpp
deleted file mode 100644
index a073b9f1cf2995763b936ad538ab9610a91fabfe..0000000000000000000000000000000000000000
--- a/alib2str/src/container/string/ObjectsVector.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * ObjectsVector.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "ObjectsVector.h"
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < ext::vector < object::Object > > ( );
-auto stringReaded = registration::StringReaderRegister < object::Object, ext::vector < object::Object > > ( );
-
-auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, ext::vector < object::Object > > ( );
-auto stringReadedGroup = registration::StringReaderRegisterTypeInGroup < object::Object, ext::vector < object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/container/string/ObjectsVector.cxx b/alib2str/src/container/string/ObjectsVector.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..e1fc63aabe96681e12965445c0f0b19cebf2e35d
--- /dev/null
+++ b/alib2str/src/container/string/ObjectsVector.cxx
@@ -0,0 +1,20 @@
+/*
+ * ObjectsVector.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsVector.h"
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteObjectsVector = registration::StringWriterRegister < ext::vector < object::Object > > ( );
+auto stringReadedObjectsVector = registration::StringReaderRegister < object::Object, ext::vector < object::Object > > ( );
+
+auto stringWriteGroupObjectsVector = registration::StringWriterRegisterTypeInGroup < object::Object, ext::vector < object::Object > > ( );
+auto stringReadedGroupObjectsVector = registration::StringReaderRegisterTypeInGroup < object::Object, ext::vector < object::Object > > ( );
+
+} /* namespace */