Refactor providermaagement

No match.