CPP OAS changes