Shapes (circle and rectangle) added.