Added pn_... stuff for AddSP