Add CFNR (and correct comment for CFNA)