Fixed issue with parameter extractor
Fixed issue due to refactoring