Added custom random generator