Mended AnalyserHandler