Classifier and feature extraction updated