Still beta. Added hooks for geonames.