Added ShapeDrawer class