Added CQI indicator classes, cohort defintions and indicators