Added extractor and fix entry