Added stuff to Classifier