Added automatic cohort check to preflight lib