Added search facade and service provider