change structure to use pnc namespace