refactored package admin