Added contentprovider and core functionality