Updates... to extractor