Added some SHAPE_COMPONENTs.