Refactored search package