content provider refactoring started