Added Geometry parsing