Added split out indicators by class.