Further refactored cohorts controller