Modify classifier so that it works with the dataset