Add Location and Gazetteer classes