Added cohort filtering