+ Renamed hasDefaultGeometry to hasGeometry