Revised fact extractor