Added cylinder and torus the ShapeBuilder