added rich extractor