Add skipGeom switch