Adding functionality to extractor
Merge changes