Add ShapeTask OOP