Added support for circles in body definitions