Added parsing of Geometry