Removed SpirePM and added CPM.