Added support for trapezoid, rect and triangle sections shapes