Refactor XHMessage model due with geolocations.