Added runtime choice of classifier.