swap shape instanciation to ShapeBuilder