diff --git a/alib2cli/src/ast/statements/FileStatement.cpp b/alib2cli/src/ast/statements/FileStatement.cpp
index 8a125feadbb261f8ccc4d99c35962452556ce2bf..a3bf050a4cb55c170c1a546ae96d5d44fa865fb9 100644
--- a/alib2cli/src/ast/statements/FileStatement.cpp
+++ b/alib2cli/src/ast/statements/FileStatement.cpp
@@ -3,8 +3,7 @@
 #include <ast/Option.h>
 #include <ast/Arg.h>
 
-#include <common/XmlParserHelper.h>
-#include <registry/XmlRegistry.h>
+#include <registry/InputFileRegistry.hpp>
 
 namespace cli {
 
@@ -16,20 +15,12 @@ std::shared_ptr < abstraction::OperationAbstraction > FileStatement::translateAn
 	if ( m_type )
 		type = m_type->getType ( );
 
-	if ( type == "set" || type == "Set" ) {
-		std::shared_ptr < abstraction::UnaryOperationAbstraction < ext::deque < sax::Token >, const std::string & > > tokens = abstraction::XmlRegistry::fileToTokensAbstraction ( m_file->eval ( environment ));
-		tokens->eval ( );
-
-		std::shared_ptr < abstraction::OperationAbstraction > res = abstraction::XmlRegistry::getXmlContainerParserAbstraction ( "Set", m_templateParams [ 0 ]->eval ( environment ) );
-		res->attachInput ( tokens, 0, true );
-		res->eval ( );
-		return res;
-	} else {
-		std::string file = m_file->eval ( environment );
-
-		return abstraction::XmlParserHelper::eval ( std::move ( type ), file );
+	ext::vector < std::string > templateParams;
+	for ( const std::unique_ptr < cli::Arg > & param : m_templateParams ) {
+		templateParams.push_back ( param->eval ( environment ) );
 	}
 
+	return abstraction::InputFileRegistry::getAbstraction ( m_file->eval ( environment ), "xml", type, templateParams );
 }
 
 } /* namespace cli */
diff --git a/alib2cli/src/ast/statements/ResultFileStatement.h b/alib2cli/src/ast/statements/ResultFileStatement.h
index ba0fe867b1085b295ce7645c9c699b9c78b773cb..6e85b41083c8c10c8088472f6d2d8d91109f9b5e 100644
--- a/alib2cli/src/ast/statements/ResultFileStatement.h
+++ b/alib2cli/src/ast/statements/ResultFileStatement.h
@@ -3,7 +3,7 @@
 
 #include <ast/Statement.h>
 
-#include <common/XmlComposerHelper.h>
+#include <registry/OutputFileRegistry.hpp>
 
 namespace cli {
 
@@ -16,9 +16,7 @@ public:
 	}
 
 	virtual std::shared_ptr < abstraction::OperationAbstraction > translateAndEval ( const std::shared_ptr < abstraction::OperationAbstraction > & prev, Environment & environment ) const override {
-		std::string file = m_file->eval ( environment );
-
-		return abstraction::XmlComposerHelper::eval ( prev, file );
+		return abstraction::OutputFileRegistry::getAbstraction ( prev, m_file->eval ( environment ), "xml" );
 	}
 
 	virtual bool getImplicitMove ( ) const override {
diff --git a/alib2cli/src/registration/InputFileTypeRegistration.cpp b/alib2cli/src/registration/InputFileTypeRegistration.cpp
index 6088d0df02a5759658ad65ff33816dfcd5772596..099a3009333993ffa21be3365517d7c93f376a3f 100644
--- a/alib2cli/src/registration/InputFileTypeRegistration.cpp
+++ b/alib2cli/src/registration/InputFileTypeRegistration.cpp
@@ -1,9 +1,22 @@
 #include "InputFileTypeRegistration.hpp"
 
+#include <common/XmlParserHelper.h>
+#include <registry/XmlRegistry.h>
+
 namespace {
 
-	std::shared_ptr < abstraction::OperationAbstraction > dummy ( const std::string & /* type */, const ext::vector < std::string > & /* templateParams */ ) {
-		return nullptr;
+	std::shared_ptr < abstraction::OperationAbstraction > dummy ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) {
+		if ( type == "set" || type == "Set" ) {
+			std::shared_ptr < abstraction::UnaryOperationAbstraction < ext::deque < sax::Token >, const std::string & > > tokens = abstraction::XmlRegistry::fileToTokensAbstraction ( file );
+			tokens->eval ( );
+
+			std::shared_ptr < abstraction::OperationAbstraction > res = abstraction::XmlRegistry::getXmlContainerParserAbstraction ( "Set", templateParams [ 0 ] );
+			res->attachInput ( tokens, 0, true );
+			res->eval ( );
+			return res;
+		} else {
+			return abstraction::XmlParserHelper::eval ( std::move ( type ), file );
+		}
 	}
 
 auto xmlInputFileHandler = registration::InputFileRegister ( "xml", dummy );
diff --git a/alib2cli/src/registration/InputFileTypeRegistration.hpp b/alib2cli/src/registration/InputFileTypeRegistration.hpp
index 28cb35ef38523538813aa8fc66ae08eb2ca06ce6..f9a46e5f2344f0093ee3a740cd0ddf2b2ea6016a 100644
--- a/alib2cli/src/registration/InputFileTypeRegistration.hpp
+++ b/alib2cli/src/registration/InputFileTypeRegistration.hpp
@@ -7,7 +7,7 @@ namespace registration {
 
 class InputFileRegister {
 public:
-	InputFileRegister ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( const std::string & type, const ext::vector < std::string > & templateParams ) ) {
+	InputFileRegister ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) ) {
 		abstraction::InputFileRegistry::registerInputFileHandler ( fileType, callback );
 	}
 };
diff --git a/alib2cli/src/registration/OutputFileTypeRegistration.cpp b/alib2cli/src/registration/OutputFileTypeRegistration.cpp
index 2f1cbca7020b5d15dd44031fc40db9f3d8f5b9b3..af4be6da61240c1b0d27f35c138004dbcc2ddc6c 100644
--- a/alib2cli/src/registration/OutputFileTypeRegistration.cpp
+++ b/alib2cli/src/registration/OutputFileTypeRegistration.cpp
@@ -1,9 +1,11 @@
 #include "OutputFileTypeRegistration.hpp"
 
+#include <common/XmlComposerHelper.h>
+
 namespace {
 
-	std::shared_ptr < abstraction::OperationAbstraction > dummy ( ) {
-		return nullptr;
+	std::shared_ptr < abstraction::OperationAbstraction > dummy ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) {
+		return abstraction::XmlComposerHelper::eval ( param, file );
 	}
 
 auto xmlOutputFileHandler = registration::OutputFileRegister ( "xml", dummy );
diff --git a/alib2cli/src/registration/OutputFileTypeRegistration.hpp b/alib2cli/src/registration/OutputFileTypeRegistration.hpp
index 223310fbd90e4b37ea871359033512b7c3b947f7..67f37e653eff46b0253e8c1a8fcf151de745ac5e 100644
--- a/alib2cli/src/registration/OutputFileTypeRegistration.hpp
+++ b/alib2cli/src/registration/OutputFileTypeRegistration.hpp
@@ -7,7 +7,7 @@ namespace registration {
 
 class OutputFileRegister {
 public:
-	OutputFileRegister ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( ) ) {
+	OutputFileRegister ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) ) {
 		abstraction::OutputFileRegistry::registerOutputFileHandler ( fileType, callback );
 	}
 };
diff --git a/alib2cli/src/registry/InputFileRegistry.cpp b/alib2cli/src/registry/InputFileRegistry.cpp
index e06f0be975050bd8488d9f4818d7977174c5b672..43e97d1d5860023bb160a2a33a318e9245b9deaa 100644
--- a/alib2cli/src/registry/InputFileRegistry.cpp
+++ b/alib2cli/src/registry/InputFileRegistry.cpp
@@ -10,16 +10,16 @@
 
 namespace abstraction {
 
-std::shared_ptr < abstraction::OperationAbstraction > InputFileRegistry::getAbstraction ( const std::string & fileType, const std::string & type, const ext::vector < std::string > & templateParams ) {
+std::shared_ptr < abstraction::OperationAbstraction > InputFileRegistry::getAbstraction ( const std::string & file, const std::string & fileType, const std::string & type, const ext::vector < std::string > & templateParams ) {
 	auto res = getEntries ( ).find ( fileType );
 	if ( res == getEntries ( ).end ( ) )
 		throw exception::CommonException ( "Entry " + fileType + " not available." );
 
-	return res->second->getAbstraction ( type, templateParams );
+	return res->second->getAbstraction ( file, type, templateParams );
 }
 
-std::shared_ptr < abstraction::OperationAbstraction > InputFileRegistry::EntryImpl::getAbstraction ( const std::string & type, const ext::vector < std::string > & templateParams ) const {
-	return m_callback ( type, templateParams );
+std::shared_ptr < abstraction::OperationAbstraction > InputFileRegistry::EntryImpl::getAbstraction ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) const {
+	return m_callback ( file, type, templateParams );
 }
 
 } /* namespace abstraction */
diff --git a/alib2cli/src/registry/InputFileRegistry.hpp b/alib2cli/src/registry/InputFileRegistry.hpp
index 6ecf007becb6c2ff3a33c00c8b4f819a8f6d5203..60b3ed90b45cc719e285525b5831ac15029b7c2b 100644
--- a/alib2cli/src/registry/InputFileRegistry.hpp
+++ b/alib2cli/src/registry/InputFileRegistry.hpp
@@ -21,22 +21,22 @@ namespace abstraction {
 class InputFileRegistry {
 	class Entry {
 	public:
-		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & type, const ext::vector < std::string > & templateParams ) const = 0;
+		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) const = 0;
 
 		virtual ~Entry ( ) {
 		}
 	};
 
 	class EntryImpl : public Entry {
-		std::function < std::shared_ptr < abstraction::OperationAbstraction > ( const std::string & type, const ext::vector < std::string > & templateParams ) > m_callback;
+		std::function < std::shared_ptr < abstraction::OperationAbstraction > ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) > m_callback;
 	public:
-		EntryImpl ( std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( const std::string & type, const ext::vector < std::string > & templateParams ) ) : m_callback ( callback ) {
+		EntryImpl ( std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) ) : m_callback ( callback ) {
 		}
 
 		virtual ~EntryImpl ( ) {
 		}
 
-		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & type, const ext::vector < std::string > & templateParams ) const override;
+		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) const override;
 	};
 
 	static ext::map < std::string, std::unique_ptr < Entry > > & getEntries ( ) {
@@ -45,11 +45,11 @@ class InputFileRegistry {
 	}
 
 public:
-	static void registerInputFileHandler ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( const std::string & type, const ext::vector < std::string > & templateParams ) ) {
+	static void registerInputFileHandler ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( const std::string & file, const std::string & type, const ext::vector < std::string > & templateParams ) ) {
 		getEntries ( ).insert ( std::make_pair ( fileType, std::unique_ptr < Entry > ( new EntryImpl ( callback ) ) ) );
 	}
 
-	static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & fileType, const std::string & type, const ext::vector < std::string > & templateParams );
+	static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & file, const std::string & fileType, const std::string & type, const ext::vector < std::string > & templateParams );
 };
 
 } /* namespace abstraction */
diff --git a/alib2cli/src/registry/OutputFileRegistry.cpp b/alib2cli/src/registry/OutputFileRegistry.cpp
index 3aa32f1ddb994947fc09546d7a1a8851a8acb465..51f68f7f8990163348cd76bf84e624449247322e 100644
--- a/alib2cli/src/registry/OutputFileRegistry.cpp
+++ b/alib2cli/src/registry/OutputFileRegistry.cpp
@@ -10,16 +10,16 @@
 
 namespace abstraction {
 
-std::shared_ptr < abstraction::OperationAbstraction > OutputFileRegistry::getAbstraction ( const std::string & fileType ) {
+std::shared_ptr < abstraction::OperationAbstraction > OutputFileRegistry::getAbstraction ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file, const std::string & fileType ) {
 	auto res = getEntries ( ).find ( fileType );
 	if ( res == getEntries ( ).end ( ) )
 		throw exception::CommonException ( "Entry " + fileType + " not available." );
 
-	return res->second->getAbstraction ( );
+	return res->second->getAbstraction ( param, file );
 }
 
-std::shared_ptr < abstraction::OperationAbstraction > OutputFileRegistry::EntryImpl::getAbstraction ( ) const {
-	return m_callback ( );
+std::shared_ptr < abstraction::OperationAbstraction > OutputFileRegistry::EntryImpl::getAbstraction ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) const {
+	return m_callback ( param, file );
 }
 
 } /* namespace abstraction */
diff --git a/alib2cli/src/registry/OutputFileRegistry.hpp b/alib2cli/src/registry/OutputFileRegistry.hpp
index 4d9dd73b52d801f33c9447bc170faca49ca48715..bae92a5e729efb0d0a02533dffd17430f609f005 100644
--- a/alib2cli/src/registry/OutputFileRegistry.hpp
+++ b/alib2cli/src/registry/OutputFileRegistry.hpp
@@ -21,22 +21,22 @@ namespace abstraction {
 class OutputFileRegistry {
 	class Entry {
 	public:
-		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( ) const = 0;
+		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) const = 0;
 
 		virtual ~Entry ( ) {
 		}
 	};
 
 	class EntryImpl : public Entry {
-		std::function < std::shared_ptr < abstraction::OperationAbstraction > ( ) > m_callback;
+		std::function < std::shared_ptr < abstraction::OperationAbstraction > ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) > m_callback;
 	public:
-		EntryImpl ( std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( ) ) : m_callback ( callback ) {
+		EntryImpl ( std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) ) : m_callback ( callback ) {
 		}
 
 		virtual ~EntryImpl ( ) {
 		}
 
-		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( ) const override;
+		virtual std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) const override;
 	};
 
 	static ext::map < std::string, std::unique_ptr < Entry > > & getEntries ( ) {
@@ -45,11 +45,11 @@ class OutputFileRegistry {
 	}
 
 public:
-	static void registerOutputFileHandler ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( ) ) {
+	static void registerOutputFileHandler ( const std::string & fileType, std::shared_ptr < abstraction::OperationAbstraction > ( * callback ) ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file ) ) {
 		getEntries ( ).insert ( std::make_pair ( fileType, std::unique_ptr < Entry > ( new EntryImpl ( callback ) ) ) );
 	}
 
-	static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & fileType );
+	static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::shared_ptr < abstraction::OperationAbstraction > param, const std::string & file, const std::string & fileType );
 };
 
 } /* namespace abstraction */