Updated with content provider and wrapper