Added gazetteer step