Updated analyzer handler.