Changes for CPP profile redirection