Dodd: CFP could expand sooner than 2025