Use validation class for returnGeometry