Added random data generation