Updated to latest gazetteer spec