Modified ContentProvider for 2 tables