+ Renamed hasDefaultGeometry to hasGeometry to use that