Improve the generation of the dummy data