Improve shape (circle and polygon have bsphere)