The Merging of CSPM and CWPP