added model + geocoder