Added cpe feauture