Analyzer performance improved