Added improved analyzer support