New type of extractor
Minor changes