Add RandomGenerator for testing purpose