Updated and cleaned the service provider