ContentResolver use refactored