Create service provider and update constructor