Refactored package