Update Wikidata, update data model

Change-Id: I4a4423c5f32e0c61ca1a1a2a96b16ec642b7f7cb