Updated extractor template