*8276* Move registration to PKP lib