Moved the geocoding from the model to a service