Refactored into package