Added new analyzer classes