Change GeoModelFactory with new model