Add cohort support