Added support for circles