Added changes to classifier