Add content provider features and unit tests :P