Added parsing of Geometry
Added parsing of Geometry