Add support for multiple cohorts and workgroup cohorts