Basic RNG support added