Update the GeoModel to ndb