*8148* Make suitable for PKP lib