Added extractor and test code.