Add CPE for remote and local