Merge of common extractors code.

Updated sample config file.