Added more to Analyzer.