Implemented cohorts, creation and updating