improved config, service provider