Refactoring of SearchProvider interface.
Refactoring of SearchProvider interface.