Make extractor more robust and extendible
Add new extractor