Added NaiveBayes and SVM