Refactored package calls