Performance enhancements for classifier