Added random generator