Make ShapeFactory class