Add support for Trd1 and Trd2. Trapezoid (aka Trd2) is supported in form of a typedef, but deprecated due to the imprecise name