Update with latest gazetteer from Kim