Finished ContentProvider refactoring