Feature/provider update service

Final merge for this feature