Extractor logic updated