Complete refactor of data set generation with adapted classifier