Added support for cohorts