Added support for ellipse