BUG-5280: refactor CohortEntry