EventAnalyzer modified