Improved classifier