Consensus reached on CPP enhancement