Added new ZL/ZJ defs and additional ZTT shape