Adding ellipse and circles support and improving constructor for it