*8212* Review components to PKP lib