*8094* Move administration to PKP lib