Refactored Package Manager