Last core.geom class moved