*8212* Streamlining for port to PKP lib