ContentProvider Refactoring