Added functionality for TBCohort and cqi