CF conventions update