ProviderManager repackaging.
some clean-up.
Refactored List and Set DoneCallbacks to better method names.