More CPE support