*8212* Ports to PKP lib