Update cohorts

Make cohorts complying with specs