Changed the service provider class