Remove dependance to service provider