Added support for ellipses and triangles - beta