Made SVM modular.