Added ExtractOnly parameter for Extractor Handler