Updated to new c-m-p plugin.