Add T-Norm and Z-Norm support