Updated DataClassifier