Adds support for the recently merged w-p CM protocol alongside the (now deprecated) old CM WIP protocols