Added name of the random to the interface
Improved the random handler