Refactored into PackageService