Initial work on updating the CFG callback mechanism.