Integrate stuff from ObjectClassifier with the rest of the library