Added ShapeContainer for review