Refactored Package