Add quadrangle, rectangle and square