Refactored to remove split package