Deal with demo data set and data generator