diff --git a/alib2common/src/abstraction/ValueOperationAbstraction.hpp b/alib2common/src/abstraction/ValueOperationAbstraction.hpp
index 8e1a605921a2e2515b82223b5c158692dd9bfb91..1b947fb64935d31354dd66e2a12c6889b8f68014 100644
--- a/alib2common/src/abstraction/ValueOperationAbstraction.hpp
+++ b/alib2common/src/abstraction/ValueOperationAbstraction.hpp
@@ -14,80 +14,10 @@
 #include <typeindex>
 #include <variant>
 #include <abstraction/Registry.h>
+#include <abstraction/ValueProvider.hpp>
 
 namespace abstraction {
 
-template < class Type >
-class ValueProvider {
-	bool m_move;
-
-protected:
-	virtual Type & getData ( ) const = 0;
-
-public:
-	typedef Type return_type;
-
-	ValueProvider ( ) : m_move ( false ) {
-	}
-
-	void setMove ( bool move ) {
-		m_move = move;
-	}
-
-	Type getValue ( ) const {
-		if ( m_move )
-			return std::move ( getData ( ) );
-		else
-			return getData ( );
-	}
-
-	virtual bool eval ( ) = 0;
-
-	virtual bool isReady ( ) const = 0;
-};
-
-template < class Type >
-class ValueProvider < Type & > {
-protected:
-	virtual Type & getData ( ) const = 0;
-
-public:
-	typedef Type return_type;
-
-	Type & getValueReference ( ) const {
-		return getData ( );
-	}
-
-	Type & getValue ( ) const {
-		return getData ( );
-	}
-
-	virtual bool eval ( ) = 0;
-
-	virtual bool isReady ( ) const = 0;
-};
-
-template < class Type >
-class ValueProvider < const Type & > {
-protected:
-	virtual const Type & getConstData ( ) const = 0;
-
-public:
-	typedef Type return_type;
-
-	const Type & getConstValueReference ( ) const {
-		return getConstData ( );
-	}
-
-	const Type & getValue ( ) const{
-		return getConstData ( );
-	}
-
-	virtual bool eval ( ) = 0;
-
-	virtual bool isReady ( ) const = 0;
-};
-
 template < class ReturnType >
 class ValueOperationAbstraction : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < ReturnType & >, public ValueProvider < const ReturnType & > {
 protected:
diff --git a/alib2common/src/abstraction/ValueProvider.hpp b/alib2common/src/abstraction/ValueProvider.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..92dd206d0ba6b322113b4f4062b292df32f40603
--- /dev/null
+++ b/alib2common/src/abstraction/ValueProvider.hpp
@@ -0,0 +1,97 @@
+/*
+ * ValueProvider.hpp
+ *
+ *  Created on: 11. 7. 2017
+ *	  Author: Jan Travnicek
+ */
+
+#ifndef _VALUE_PROVIDER_HPP_
+#define _VALUE_PROVIDER_HPP_
+
+#include <exception/CommonException.h>
+#include <utility>
+
+namespace abstraction {
+
+template < class Type >
+class ValueProvider {
+	bool m_move;
+
+protected:
+	virtual Type & getData ( ) const = 0;
+
+public:
+	typedef Type return_type;
+
+	ValueProvider ( ) : m_move ( false ) {
+	}
+
+	void setMove ( bool move ) {
+		m_move = move;
+	}
+
+	Type getValue ( ) const {
+		if ( m_move )
+			return std::move ( getData ( ) );
+		else
+			return getData ( );
+	}
+
+	virtual bool eval ( ) = 0;
+
+	virtual bool isReady ( ) const = 0;
+};
+
+template < class Type >
+class ValueProvider < Type & > {
+protected:
+	virtual Type & getData ( ) const = 0;
+
+public:
+	typedef Type return_type;
+
+	void setMove ( bool ) {
+		throw exception::CommonException ( "Reference cannot be moved." );
+	}
+
+	Type & getValueReference ( ) const {
+		return getData ( );
+	}
+
+	Type & getValue ( ) const {
+		return getData ( );
+	}
+
+	virtual bool eval ( ) = 0;
+
+	virtual bool isReady ( ) const = 0;
+};
+
+template < class Type >
+class ValueProvider < const Type & > {
+protected:
+	virtual const Type & getConstData ( ) const = 0;
+
+public:
+	typedef Type return_type;
+
+	void setMove ( bool ) {
+		throw exception::CommonException ( "Const reference cannot be moved." );
+	}
+
+	const Type & getConstValueReference ( ) const {
+		return getConstData ( );
+	}
+
+	const Type & getValue ( ) const{
+		return getConstData ( );
+	}
+
+	virtual bool eval ( ) = 0;
+
+	virtual bool isReady ( ) const = 0;
+};
+
+} /* namespace abstraction */
+
+#endif /* _VALUE_PROVIDER_HPP_ */