Refactored add_cohort