diff --git a/alib2aux/src/debug/Random.cpp b/alib2aux/src/debug/Random.cpp
deleted file mode 100644
index 33ccd78c1c0584d0f29123e0d7f93df372df497c..0000000000000000000000000000000000000000
--- a/alib2aux/src/debug/Random.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "Random.h"
-#include <registration/AlgoRegistration.hpp>
-
-namespace {
-
-auto RandomInt = registration::AbstractRegister < debug::Random < int >, int > ( debug::Random < int >::random );
-auto RandomUnsigned = registration::AbstractRegister < debug::Random < unsigned >, unsigned > ( debug::Random < unsigned >::random );
-
-} /* namespace */
diff --git a/alib2aux/src/debug/Random.h b/alib2aux/src/debug/Random.h
deleted file mode 100644
index a36240c68d95d03bde3b147dce1a9588262c1e02..0000000000000000000000000000000000000000
--- a/alib2aux/src/debug/Random.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <ext/random>
-
-namespace debug {
-
-template < class T >
-class Random {
-public:
-	static T random ( );
-};
-
-template < class T >
-T Random < T >::random ( ) {
-	return ext::random_devices::semirandom ( );
-}
-
-} /* namespace debug */
-
diff --git a/alib2aux/src/generate/Random.cpp b/alib2aux/src/generate/Random.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..157e0ca9576f59d3dff83e02b00d2b8c425d9a80
--- /dev/null
+++ b/alib2aux/src/generate/Random.cpp
@@ -0,0 +1,11 @@
+#include "Random.h"
+#include <registration/AlgoRegistration.hpp>
+
+namespace {
+
+auto RandomInt = registration::AbstractRegister < generate::RandomFactory < int >, int > ( generate::RandomFactory < int >::randomNumber );
+auto RandomIntRange = registration::AbstractRegister < generate::RandomFactory < int >, int, const int&, const int& > ( generate::RandomFactory < int >::randomNumber );
+auto RandomUnsigned = registration::AbstractRegister < generate::RandomFactory < unsigned >, unsigned > ( generate::RandomFactory < unsigned >::randomNumber );
+auto RandomUnsignedRange = registration::AbstractRegister < generate::RandomFactory < unsigned >, unsigned, const unsigned&, const unsigned& > ( generate::RandomFactory < unsigned >::randomNumber );
+
+} /* namespace */
diff --git a/alib2aux/src/generate/Random.h b/alib2aux/src/generate/Random.h
new file mode 100644
index 0000000000000000000000000000000000000000..8c26d89924a039845c445a94853a357c478669f8
--- /dev/null
+++ b/alib2aux/src/generate/Random.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <ext/random>
+
+namespace generate {
+
+template < class T >
+class RandomFactory {
+public:
+	static T randomNumber ( );
+
+	/** @brief Returns random number within range lo (inclusive) and hi (exclusive) */
+	static T randomNumber ( const T& lo, const T& hi );
+};
+
+template < class T >
+T RandomFactory < T >::randomNumber ( ) {
+	return ext::random_devices::semirandom ( );
+}
+
+template < class T >
+T RandomFactory < T >::randomNumber ( const T& lo, const T& hi ) {
+
+	return ext::random_devices::semirandom ( lo, hi );
+}
+
+} /* namespace generate */
+
diff --git a/alib2std/src/extensions/random.hpp b/alib2std/src/extensions/random.hpp
index ebc7fa91df17d9f5b93b10ed3baef608e8afbee2..6a4f4965208902f18968351a24d22de4048abf9c 100644
--- a/alib2std/src/extensions/random.hpp
+++ b/alib2std/src/extensions/random.hpp
@@ -20,6 +20,7 @@
 
 #include <random>
 #include <limits>
+#include <stdexcept>
 
 namespace ext {
 
@@ -92,6 +93,17 @@ private:
 			return dis(gen);
 		}
 
+		/** \brief Returns random value withing lo (inclusive) and hi (exclusive)
+		 * \return semirandom value
+		 */
+		result_type operator()( const result_type& lo, const result_type& hi ) {
+			if ( lo >= hi ) {
+				throw std::invalid_argument ( "Empty range." );
+			}
+
+			return ( dis(gen) % ( hi - lo ) ) + lo;
+		}
+
 		/**
 		 * \brief
 		 * Getter of the minimal value the semirandom device can produce.