Adding structure for T1 and T2 logic.