Some updates to ShapeContainer