Add CFP Support