According to this published on the gov website AF is an underlying condition coming under Chronic Heart Disease, see table 3,
assets.publishing.service.g...
so does that mean those age 16-64 with AF are in Cohort 6! Apparently GP practices are being told to start concentrating on this cohort from tomorrow (so NHS website says england.nhs.uk/2021/02/nhs-... )