Added Extractor class
Fixed output parameters