Updated Geometry to use vector of