Changed how the service provider works