*Added draw mode
*Del getData method from Geometry