added updated extractors