Refactor providermaagement