Data generation improved