Added the choice between two shape types, box and ellipse