Merge "Refactor providermaagement"