Added gazetteer service