Improve pkmgr gather