Improved features for text extraction + ability to switch to other classifiers