Added search client and provider feature