Revised GeometryFactory