OAS CPP changes