Added some new features and refactored gazetteers