Extend the support for non-circular shapes, as we are already supporting circular shapes
Extend the support for non-circular shapes, as we are already supporting circular shapes