Refactoring the provider_id