Updated Analyzer