Streamlines service provider config, improves ease of use and fixes several related bugs