Added extractor class