Added Shapes class