CFP overhaul is gaining support