Added content provider and database handler