Updated entities with missing fields and correct names