Add Event support, Debug around <t>