Analyzer improvements