Added some preparation for classifier.