Merge "Refactor providers/managers"