Full GeoModel compatibility