Optimization extractor added.