Added support for circles.