Added Shapes and Rectangle