Image now uses the Geometry class