Added a class to generate the dataset