Refactored search manager