Updated data generator to use receiver