Even more refactoring : search providers