Updated service provider and documentation