Refactored search methods